# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.930.24.4 -> 1.930.24.5 # drivers/char/serial.c 1.34 -> 1.35 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/02/13 davidm@tiger.hpl.hp.com 1.930.23.10 # ia64: Don't risk running past the end of the unwind-table. Based on a patch by # Suresh Siddha. # -------------------------------------------- # 03/02/13 jgarzik@redhat.com 1.930.28.1 # [ARM] CREDITS, MAINTAINERS, Documentation/arm/* updates # # Adds new Doc/arm/ documents Booting, ConfigVars, MEMC, and # SA1100/SA1100_USB, in addition to other small doc updates. # -------------------------------------------- # 03/02/13 jgarzik@redhat.com 1.930.28.2 # [ARM] misc janitorial cleanups for arch/arm/kernel # -------------------------------------------- # 03/02/13 jgarzik@redhat.com 1.930.28.3 # [ARM] misc janitorial cleanups for arch/arm/mach*, arch/arm/mm # -------------------------------------------- # 03/02/13 jgarzik@redhat.com 1.930.28.4 # [ARM] misc janitorial cleanups for include/asm-arm # -------------------------------------------- # 03/02/13 jgarzik@redhat.com 1.930.28.5 # [netdrvr 8390] if ARM, only redefine EI_SHIFT, not I/O macros # -------------------------------------------- # 03/02/13 jgarzik@redhat.com 1.930.28.6 # [netdrvr] add new ARM net drivers cirrus, ether00 # -------------------------------------------- # 03/02/14 davej@codemonkey.org.uk 1.930.25.5 # [netdrvr sunqe] remove incorrect kfree() # # Use of init_etherdev's second argument causes the ->priv member # to be allocated at the same time as the struct net_device # itself. Therefore, no additional kfree() is needed for the # struct net_device ->priv member in this case. # -------------------------------------------- # 03/02/14 jgarzik@redhat.com 1.930.25.6 # [netdrvr bmac] Remove unneeded memset() # # init_etherdev zeroes this memory for us, no need to do it again. # Spotted by Dave Jones. # -------------------------------------------- # 03/02/14 Kare.Sars@lmf.ericsson.se 1.930.25.7 # [atm nicstar] fix incorrect traffic class assumption # # I have encountered a bug in the nicstar ATM driver for linux. # # If you open a CBR TX only connection on a specific vpi/vci and later open a RX # only connection on the same vpi/vci, the RX connection will overwrite the # pointer to the SCQ of the TX connection. This changes the cell rate of the TX # channel and what is worse is that when the TX connection is closed we get a # segmentationfault and the TX part of the vpi/vci remains reserved. # # The bug in the driver is that if the opened channel is not TX CBR, the driver # assumes it is TX UBR. I have attached a patch that adds a check for TX UBR. # The patch is against RedHat kernel 2.4.18-3. I have checked linux vanilla # kernels 2.4.19 and 2.5.49 and not found a fix. # -------------------------------------------- # 03/02/14 dave@thedillows.org 1.930.29.1 # The initial release of the driver for the 3Com 3cr990 family # of network cards. # # Does: # - NAPI # - Zero copy Tx # - VLAN hardware acceleration # - TCP Segmentation offload # -------------------------------------------- # 03/02/14 bbosch@iphase.com 1.930.25.8 # [netdrvr ns83820] big endian fixes # -------------------------------------------- # 03/02/14 fubar@us.ibm.com 1.930.25.9 # [netdrvr 3c59x] move netif_carrier_off() call outside vortex_debug test # -------------------------------------------- # 03/02/14 meissner@suse.de 1.930.25.10 # [netdrvr pcnet32] fix multicast on big endian # -------------------------------------------- # 03/02/14 jgarzik@redhat.com 1.930.25.11 # Merge http://typhoon.bkbits.net/typhoon-2.4 # into redhat.com:/garz/repo/net-drivers-2.4 # -------------------------------------------- # 03/02/14 jochen@scram.de 1.930.25.12 # [tokenring smctr] fix MAC address input # # After taking a second look, i just recognized that both cases (MAC adress # all-zero or not) are handled exactly the same (by duplicated code), so the # whole stuff is unnecessary. # # The whole function just reduces to a simple copy loop: # -------------------------------------------- # 03/02/14 pazke@orbita1.ru 1.930.25.13 # [netdrvr eepro100] add config option for PIO register read/write # -------------------------------------------- # 03/02/14 jochen@scram.de 1.930.25.14 # [tokenring madgemc] fix memory leak, add proper refcounting # -------------------------------------------- # 03/02/14 marcelo@freak.distro.conectiva 1.930.1.51 # Merge bk://ppc.bkbits.net/for-marcelo-ppc # into freak.distro.conectiva:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/02/14 rusty@rustcorp.com.au 1.930.1.52 # [PATCH] namespace pollution in procfs # # (Included in 2.5) # From: Arnd Bergmann # # de_get and de_put are used only in the file they are # defined in, so make them static # ===== fs/proc/inode.c 1.18 vs edited ===== # -------------------------------------------- # 03/02/14 marcelo@freak.distro.conectiva 1.930.1.53 # Merge bk://namesys.com/bk/reiser3-linux-2.4-directio-fix # into freak.distro.conectiva:/home/marcelo/bk/linux-2.4 # -------------------------------------------- # 03/02/14 bjorn_helgaas@hp.com 1.930.23.11 # ia64: Add some default configs. # -------------------------------------------- # 03/02/14 bjorn_helgaas@hp.com 1.930.24.5 # HP multiport serial: fix build when CONFIG_PCI undefined # (i.e,. for ski simulator). # -------------------------------------------- # diff -Nru a/drivers/char/serial.c b/drivers/char/serial.c --- a/drivers/char/serial.c Wed Oct 8 09:06:50 2003 +++ b/drivers/char/serial.c Wed Oct 8 09:06:50 2003 @@ -1167,14 +1167,15 @@ } /* - * This subroutine is called when the hp_diva_timer goes off. In certain - * cases (multiple gettys in particular) Diva seems - * to issue only a single transmit empty interrupt instead of one each - * time THRI is enabled, causing interrupts to be "used up". This - * serves to poll the Diva UARTS more frequently than rs_timer() does. + * This subroutine is called when the hp_diva_timer goes off. In + * certain cases (multiple gettys in particular) Diva seems to issue + * only a single transmit empty interrupt instead of one each time + * THRI is enabled, causing interrupts to be "used up". This serves + * to poll the Diva UARTS more frequently than rs_timer() does. */ static void hp_diva_check(unsigned long dummy) { +#ifdef CONFIG_SERIAL_SHARE_IRQ static unsigned long last_strobe; unsigned long flags; int i; @@ -1190,6 +1191,7 @@ } last_strobe = jiffies; mod_timer(&hp_diva_timer, jiffies + HP_DIVA_CHECKTIME); +#endif }